Install a Default RC file that sets the tooltips color to yellow. (#58542)

Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkrc.default gtk/Makefile.am: Install a Default
        RC file that sets the tooltips color to yellow. (#58542)

        * gtk/gtksettings.c (gtk_settings_class_init): make
        the default theme "Default", not NULL.

diff --git a/ChangeLog b/ChangeLog
index 089dd01ec476d8abda59da95df3bd1e03542f7e1..87fd763d2e7537b54b43654c00bb4b3c2f285916 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.default gtk/Makefile.am: Install a Default
+       RC file that sets the tooltips color to yellow. (#58542)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): make 
+       the default theme "Default", not NULL.
+
 Thu Jan 31 11:33:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 089dd01ec476d8abda59da95df3bd1e03542f7e1..87fd763d2e7537b54b43654c00bb4b3c2f285916 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.default gtk/Makefile.am: Install a Default
+       RC file that sets the tooltips color to yellow. (#58542)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): make 
+       the default theme "Default", not NULL.
+
 Thu Jan 31 11:33:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 089dd01ec476d8abda59da95df3bd1e03542f7e1..87fd763d2e7537b54b43654c00bb4b3c2f285916 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.default gtk/Makefile.am: Install a Default
+       RC file that sets the tooltips color to yellow. (#58542)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): make 
+       the default theme "Default", not NULL.
+
 Thu Jan 31 11:33:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 089dd01ec476d8abda59da95df3bd1e03542f7e1..87fd763d2e7537b54b43654c00bb4b3c2f285916 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.default gtk/Makefile.am: Install a Default
+       RC file that sets the tooltips color to yellow. (#58542)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): make 
+       the default theme "Default", not NULL.
+
 Thu Jan 31 11:33:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 089dd01ec476d8abda59da95df3bd1e03542f7e1..87fd763d2e7537b54b43654c00bb4b3c2f285916 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.default gtk/Makefile.am: Install a Default
+       RC file that sets the tooltips color to yellow. (#58542)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): make 
+       the default theme "Default", not NULL.
+
 Thu Jan 31 11:33:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 089dd01ec476d8abda59da95df3bd1e03542f7e1..87fd763d2e7537b54b43654c00bb4b3c2f285916 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.default gtk/Makefile.am: Install a Default
+       RC file that sets the tooltips color to yellow. (#58542)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): make 
+       the default theme "Default", not NULL.
+
 Thu Jan 31 11:33:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 089dd01ec476d8abda59da95df3bd1e03542f7e1..87fd763d2e7537b54b43654c00bb4b3c2f285916 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Thu Jan 31 14:50:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.default gtk/Makefile.am: Install a Default
+       RC file that sets the tooltips color to yellow. (#58542)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): make 
+       the default theme "Default", not NULL.
+
 Thu Jan 31 11:33:52 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkproperty-x11.c (insert_atom_pair): Fix 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index bcdcb3d41c8973ebeaf0e1223d50b70f1aafd592..dce331ac3fec29937bcbebb0da8df574faeb9f94 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -581,14 +581,13 @@ libgtk_target_ldflags = $(gtk_win32_symbols) -lwsock32
 endif
 EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la
 
-
-# We create a dummy theme for the default GTK+ theme
+# Install a RC file for the default GTK+ theme
 install-data-local:  install-ms-lib install-libtool-import-lib
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
-       echo "# Empty gtkrc for default theme" > $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
-       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
+       $(INSTALL) gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
 
 DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la $(top_builddir)/gdk/$(gdktargetlib)
 
@@ -628,6 +627,7 @@ EXTRA_DIST += @STRIP_BEGIN@         \
        gtk.def                 \
        gtk-win32.rc            \
        gtk-win32.rc.in         \
+       gtkrc.default           \
        makefile.mingw          \
        makefile.mingw.in       \
        makefile.msc            \

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 5832a1bbeb9be5c72bc3c4408ab4fe45c6e7ed4f..14f44f1cac3aab9be0d523aeb318240070be8cd4 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -178,7 +178,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                              g_param_spec_string ("gtk-theme-name",
                                                                   _("Theme Name"),
                                                                   _("Name of theme RC file to load"),
-                                                                 NULL,
+                                                                 "Default",
                                                                  G_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_THEME_NAME);